build: fix inclusion of m4/introspection.m4

The gobject introspection additions expected autoreconf to be used in
autogen.sh, perhaps we should do that instead? This commit should fix
building on systems that do not have introspection.m4 in system dirs.

diff --git a/autogen.sh b/autogen.sh
index cd9712b296f2dcd4fd546c9ea50ecf7dc0ce5728..41b8d64e9df73a77132e0c37b52198aac0c43ba6 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -165,6 +165,7 @@ if test -z "$*"; then
 fi
 
 
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
 if test -z "$ACLOCAL_FLAGS"; then
 
     acdir=`$ACLOCAL --print-ac-dir`

diff --git a/configure.ac b/configure.ac
index 0a46daaeb51af07b070ecbffef529cd896dbe20e..e0790b9996eb7c33d4ddedd5b644f3db64d9c65b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ if test "x$BABL_UNSTABLE" = "xyes"; then
   AC_DEFINE(BABL_UNSTABLE, 1,
             [Define to 1 if this is an unstable version of BABL])
 fi
-AM_CONDITIONAL(BABL_UNSTABLE, test "x$GEGL_UNSTABLE" = "xyes")
+AM_CONDITIONAL(BABL_UNSTABLE, test "x$BABL_UNSTABLE" = "xyes")
 AC_SUBST(BABL_UNSTABLE)
 
 

diff --git a/m4/introspection.m4 b/m4/introspection.m4
old mode 100644 (file)
new mode 100755 (executable)